Revert "Revert "Better comments and custom labels""

This reverts commit 0ab6bf535c53f9bc0c5b5dcbcc557238054ba8f7.