syntax fixes and stuff