Minor updates, some additional comments