Updates to structure and some words