messages improved, flow almost fixed