harmonize and finalize modules: refs  #507 #523