Fixed bugs and completed stretch goals