Fixed missing semicolon & missing vars