further misc updates for 0.4