fix notice and comments