class keyword (partially) and fixes