changed database
recoded portions
merged origin to master (repair)