Better docs, naming, few bug fixes