more stuff for 0.1.2