Fixes details in series, a bit of refactoring.
fixes #1, fixes #3, fixes #7, fixes fixes #8, fixes #9.