Bug fix and docs ... docs ... docs