Basic updates to cpu and timer. Commented out a couple things.