all except efficiency done

lots of changes