minor code and documentation changes, clean