added lines for 0x0 fixed some things broke others