working on fixes