Clean-ups
Added text back
Serious clean-ups