Minor bug fixes, hooked up receiving msgs