adding change made in master
removes some debugging
updating cron time to match master; one less merge-conflict