cosmetics
cleaned up logging
the missing argument test should be performed on the hash
Added contexts to logger