Final updates to 1.0