Final polish-up for version 0.26alpha