More testing and bugfixing in footprint

Also, tests pass now