Various minor updates and changes. Added moar comments.