fix bugs i created in the last push