Added std logging
tweakes