cleanup and some more texts