Simon's additions, many based on Garrett's feedback