various bugfixes and improvements
amqp configuration improvements