deep inspect done, minor bug fixes