Testing and Documentation
added comments and minor changes
minor changes
minor changes2
fixed a merging problem