Update comments, other various fixes