add msg and various cleans