Fixed the bug with side hits!!!
Some cleanup.