SERIOUS BUG FIX

Fixed all of bullshit syntax errors which were initially introduced by
Shiki Suen