Fixed a few bugs, working on build system