Adding a few items to the collision control.

In red to be visible, but will be changing them to transparent. this is
just to make it easy for me to track the changes.
Fixed the bug with collision detection.

There was an issue where the collision would lead to the character
walking into the walls. Fixed it, now checks for collision after the
move, if it happens, the hero is placed back where it came from.