fixed classes here and there