Small code review.

Fixed last tuning issue,
Resolved issue with Updater won't launch,
Update for JSON lib,
Minor changes.