added collisions and minor changes... work in progress