Fixed remaining notes; commented out a few examples that take longer to run
Fixed conflict