Added additional comments and removed junk
updated base
Merge branch 'development'