more testing complete and errors fixed!