Made some changes to logging -- see previous commit