Refactoring, bug fixes and additional information on the process