Added a few minor chnages