slight tweaks re classes