Added rocket deletion and fixed certain wall collisions
Merging changes