Fixed bug populating >7 weeks, removed comments