Bugs solutions

Some bug fixes for eAdventure Mockup.