Added week report 4, fixed some small bugs and refactored a little.