Working out collision bugs and making prefabs