More comments & misc to be merged into master