updated stuff for 0.2