Refactoring: removed some TODOs, wrong buffers, comments.