dishes population, bug fixes, code cleaning