change default convention dir (!)
minor fixes and simplifications