Minor updates, mainly comments