binary output format tweaks
fixing imports