various fixes
fix sub class