Added messaging system, other minor tweaks