Large patcher update and added more debug output