new customization core + bug fixes #3