Pre release/0.1.8

Minor adjustments after doing live testing yesterday.