little fixes by J