Cleanup, implement missing methods in Message, add sources.