Huge cleanup and small docu for  make stuff