Improved cleanup on port trap failure. Bumped version numbers