Trivial/unnessary synchronization
Cosmetic
Cosmetics
Fixes #1298
Always warn users
Display Client version as well
Typo fixes and cleanup of code