wip arrow offsets
Merge branch 'beta'