[FIX] some padding
[FIX] some borrow regressions + borrow feature file splitting