#126 minor improvements