Some thoughts, changes, nothing too substantial