Few TODO and errors fixed: problems on accessors.