Final changes and fixes.