Several improvements; here and there.