fixed more of Jacklin's bugs