bugfixes and cleanups, guest IN A