Fixed references, updated time setting to be more friendly