Slight overhaul of the docu interface