improved reports; start adding week-based constraints