Fixing some syntax and stuff