applied most all changes rc v1.0r2