Converted demo 3 to Macrogl entites + various minor changes and corrections