various changes and removed isWeekly toggle