Updated the timer interupts.
Other minor changes.