additions and bug fix

added som functionality as well as fixed a bug where the week numbers
where not calculated correctly