Long commit. Mainly added users and corrected pages based on feedback from Carsten and Jari