FIX DOC: Cleanup and tutorial

@dengemann: can you test and let me know if this satisfies your requirements? I've tried to test for the other corner cases (which we had encountered earlier) but would be good if you can do some testing on your end to check if we didn't reintroduce any old bug.