Syntax fixes, but still not working correctly