Added update timer plus a few changes.