More appropriate time settings; minor fixes