Applied several requested changes