patcher: cleanup and fixed comments