Bitfields etc

Small hacks for makefile and bitfield stuff.