bug fixes etc
fixed conflicts
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all