#135 minor improvements