clean up. some more testing done- ok.