expand db tables; fix bug in deleting callbacks