Some Minor updates