added Spike entity, fixed small things