Message Services pt.2 and bug fixes