More testing

Think I am done testing until I figure out these two problems