further 0.3.6 improvements