Some cleanup, some speedup, added reading of multiple binaries