persistent messages and some minor changes