comments work in progress
fixed errors
Getting all odd changes committed
Merge branch 'comments'