Wordsmith & layout changes per Josh's reccomendations