some fixes
Merge branch '#6-Divisions'