fixing last minute bugs + moving things around a bit