Removed some debugging info, and added some comments