tweaks re classes and functions