cleans up a little and adds short commands