Superficial cleanup to fix broken comments, some compile warnings