minor fixes for 0.1