I2C Fix

I believe that these are all the changes we needed from hacky.
Please notify me if there is something amiss.