merge configuration normalization and bug fixes