more updates for v1.1