Final changes and updates