few basic changes...
camel case comment
merged some conflicts