Fixed some more todos
Merge branch 'master' of https://github.com/mcmhav/muchbazar