align tip and fix tent collisions a bit