- cleanup
 - define more messages