General cleaning up, better warnings, fixed some corner cases. Some more graceful failing.
Fixed a would-be status bar bug.