August 11th update

Cleaned up some scripts and updated cherry picking script with Raik's
package