Code cleanups, bug fixes.  Bump version to 1.4