added spikes and spikewalls, tweaked player collision