Some additional work and bug fixes regarding the first two sprints