Comments, fixed relay class, and stuff