Added a whole bunch of comments, and moved various shit around