Changed verbose TODOs into Issues #1125, #1126 and #1127. Left some short TODOs in their place.