Refactored a bit
Fixed some more collision