Address comments; violations