More descriptive commentary and 'Apache Aurora'