Process most of jan's comments