Few changes

First try on commiting from CCS
Headers cleanup

Few changes, mostly BIT2 instead of 0x04