Added additional comments and restaged (and committed this time) changes from earlier