#37 minor changes