bug correction and new features

coredata reorganized to bare white new functionalities