fixed comments and crosslink names