added week-facet, something shows up, lots of bugs and redundancies in code...