adding basic logic to week selector.
some other fixes.