message handling, combined retrieval, bug fixes