fixes/updates for 0.4