Binary and data

+ small code changes