Added comments, misc. tweaks