Rearranged y_timers.  Fixed the y_users upgrade required for new systems.