fixes by Morley B