Added time display, other changes