Final changes and refs