bugfixes and internal restructuring
copying msg