many updates for 0.1 finalization