fixes that need work on