fixed a few remaining ???; consider it released.
Authored by: erwaelde 2015-05-11
Parent: [r15]
Child: [r17]
