worked on fixes