removed issues with doc36
fix for doc37
fix for doc40
fix for doc46
updated documentation