Fixed bugs, project should compile now