reorder to be more logical and more gentle
fix reference errors and remove reference to source code
fix formatting issues
better titles