fixed tiny bugs.. :)