Messaging fixed. Misc stuff