Minor changes made and all is well so far