Bug fixes
Added some comments
commit before merge
Merge branch 'Bill2'