cleaned some stuff up- time control seems to be working