final fixes for 0.1