maping fix, config ordering fix, beta.12