Revision and fixes.