some fixups, timer stuff, timer demo, etc.