Doc update and portability improvements