Bootstrap, small fixes
Merge branch 'master' of github.com:CandB/munanashampurilainen