Friday

Documentation, refactoring and some bug fixes.