updated docs plus updated from latest master