0.9.6
export more stuff