fixed shooting bug; finished collisions