Cleaned up the Initial and Final time widths that was bugging me...