Many fixes. New config file assembly style.