Update comments and fixes