Finishing touches. Ready to demo
message tweaks