Usage improvements

@rafaqz would appreciate a review of this, see if you notice any issues.