various fixes for 0.1.1