The topics planned for sprint 4 where (partially) implemented or improved. Some refactoring was done.