Update comments
Minor bug fixes