remove patch problems and fix picture paths