Minor updates, mostly added comments