Improve Inspector (and fix specs)