knowl and code style fixes