Cleaned up some code, fixed build paths