Finish up instances and 1.0 porting