Doc update .. unfinished