Removed some comments, updated GLOBALS definitions