fixed the annoying enabling bug
fixed some minor bit and bytes