Fixes all around, experimenting with freewall internals