Final updates for v1.1a