improvements, did I mention db dump?