copy over timezone + some tidy up