Slightly improved some annotations and documentation