Added some more physics on sprites
Fixed conflicts