small bug fixes
Merge branch 'developement'