Various improvements
Deleted todo