Added information to logging, so that logs are more consistent/clearer