ticket:5 minor changes