Consolidate sit implementation, persist sit location to avoid sinking over successive restarts (commit: fc83c28)