Some updates (thanks, akh).