fixed 2 week
some more fixes to 2 week
fix small errors
Merge pull request #180 from microwolnovka/new_2_week

2 week fixed small errors