some polishing, ready for A0.2 release