Switch to bytes for all sizes and minor cosmeitcs