Final fixes, starting position set