Add more documentation blocks
Minor changes