Fixed wall collision
Added splitting