mattdrayer/master: Additional comments