add buffered-msgs support and remove bug from metadata