Added some comments for things TODO (ideas for new features)