Initial dist subtree commit
Fix double limit + offset