Further updates to v1.0.0