Improve init documentation and add minor fix