Coding

Debugging, code review, documentation and refactors.