Bugfixes, better description of each step.