bug fixes from icarito