Slight fix to last commit
Doc string updates
A few more simple changes