bug fixes
fixed data manager
fixed DataMaster