Refactor: add docs
Remove the word 'FIXME' in some commets