Fix int overflow.  Minor changes.