minor geometry and position changes