ENH: Fixes for Documentation, small fixes for code