Added comments.
Added two new selfchecks.