(cleanup) comments and directive name corrections