Fixed A bunch of stuff to get the project to build and run