some fixes to thiings
Merge branch 'master' of https://github.com/heyniki/dining