cleaning up, squashing bugs, etc