eAdventure Mockup bugfixes and adjustments after the recent refactoring.
Merge pull request #396 from RotaruDan/adjustments

eAdventure Mockup bugfixes and adjustments after the recent refactoring.