6135ec864f
* Refactors bitflag values into bitshifts * minor formatting edits * Unbitshifts a macro set that skipped 3 for whatever reason