Fixed a bunch of issues with project