a few more updates for 0.5.4