Minor updates
Minor uodates