Final changes, comments