some temp fixes
Merge branch 'dev' of github.com:Delta-Plan/Kitchen into dev