step7
step8
step8
step9 and small fixes
small fixes