fix time issue and other cosmetics.