fixes, updates and refactor
Binary formatter