Integrated timer code, other small fixes