Fix specs broken by recent commits

Also a couple small regressions
Few follow on spec fixes
UI: fixes to test suite (in progress)

Small cleanups / optimizations to omega js code as well to
tighten things up