more servo class tweaks