Adjusted Milestones

As usual, also some additions and changes to the source-code.