Added Story 16 to manual and did some refactoring. Victor & Philip