cleanup and typos
restructuring messages