Marginal performance upgrade + db stuff (I think); dev 0.3.9