#114 minor improvements