Improve CLI, adapt to new UPS source location, better error handling, update docs.