Change log update
Cosmetics
Squash multiple warnings and a string comparison bug