added some more binary macros for ease of controls, changed spec