Small improvements in readability and some fixes for comparisons.