TODOs for 0.4:

*Rework and correct strings