class rename + minor changes