class tweaks