Fixed bugs and more stuffies