minor changes in core functionality