Improved collision a little, still not perfect..