Final changes and housekeeping done