subtype update, plus minor changes