Fixed binary converters, moved some things around