Added missing files and bit width errors