rebase success!
Test and fix db logic, standardize on non-db params
Serialize command history; fix timeout bug