wls: fixing ols first, wasnt working with the new setup; misc fixes