Fixed some problems, some more remain.
Merge branch 'master' of https://github.com/nnesic/CerealKillers.git