Added contact component & fixed bugs with default entity values