Final final commit

Finished all syntax issues