fixed some thigns