Units and cleanup

* show units with "i" to indicate binary base
* use define for const values