overhaul help to work better with aliases
fix terrible command matching bug