Various stuff in attempt to improve collision

Achieved to remove a major problem, introduced several minor though.
Think I'm gonna rewrite the whole thing first before being able to fix
that