[FEATURE] Add comments and inline-if fix

I hope that now without conflict.