add some whitespace
rework parsebuffer to avoid recursion
Merge branch 'trampoline'