refactored code.

tweaked values so that the collison looks better
added entity factory