several changes to use local definitions and responses, and quick fixes