-- now with some keyboard commands and cruft removal