[sprint 6] small changes
[sprint 6] little fixes