working on squashing bugs