fixed tiny bugs