Some updates
Minor updates