Overall changes

Various changes based on comments