tighter control of shortcuts
fixed db disposals