add inline option rendering
add expanded 'fix' in comments