Added add patch && minor fixes