Drop logging, fix some variables.