collision fixes, added spawn points