Development thijl

All sonar issues were solved or marked with a TODO if the changes where big. When unit tests are written for those classes, we can safely change the code.