added time, style tweaks