all required stuff added
config for local pathching
general clean up patch