Add comments; patch a few things