starts to get docs ready to build properly
small fix to docs
minor change
improves default in docs
sorts out indentation in docs
resolve merge conflicts