miscellaneous fixes and improvements
working interactive mode