updated some state and types