Additional console outputs, minor bug fixes