some inteface merged; logic bugs about singleton in beanfactroy fixed