Add upgrader
Improve help messages