refactor, add misc

notably, ^a now works in cmd