Minor adjustments and documentation