fixes for rdoc and readability improvemens