added more small changes