A few suggestions, and couple of fixes