SAMARA: SMALL UPDATE

FEW BUG FIXES