Add comments, move a few things around