more normal mode stuff and typo found by @razic