more type changes