Fixed the whole not compiling thing, and simplified a lot of things.