clean up a bit for 0.1 release