Minor style changes.
Some modifications after renaming stuff in other namespaces.
Minor modifications due to schema changes in rendered data.
Some refactoring (mostly renaming) of the functions. Main dish and side dishes are now separated.