ticket:13
- little fixes