Updates and clean up based on Rob's video