package cleanup and messaging
merge