Update comments; fix