Took care of collisions

The fake lighting doesn't work yet, the infrastructure is there but
there's a bug somewhere.