working on fixing things