Fix description and move TODO to issues