bunch o' type changes