Fixed collision detection to work looking in either direction + Cleaned up some code..