Lots of stuff added, +1/-1, some speech things, comments...