Cleaned up callbacks, and message ending and raw data for messages without bodies