updates for git issues #3, #4, #5, #6, #7, #8

updates for git issues #3, #4, #5, #6, #7, #8 #3