Removed some comments, updated some stuff.