Bugfixes, basic inspector