Options

A set of clenups, bugfixes and refactorings.