Cleaned up a bit more and fixed the build