all sorts of changes. some layout, some guts, some frustration