Expanded movement buffer with pos buffer

- Also other improvements and fixes