Clean up position advances.
Use correct dynamic grid window.
Remove debug logs.