updates for 0.5alpha