Comment & code fixes

clean up in comments, fixes in standards of code, etc..