Fixed syntax errors
Fixed more glitches