Mostly w3m related changes