Mark additional inline comments.

Close comments.

Update files in line with feedback.

danq added inline comments.

Feedback.

Removed not required changes to sbi.c file.

Run git diff with -U999999 option.