Small tweaks, added support or 4 more message types