additional Changes to allow Loging and several of Andrews issues