Touched up on most classes