fixed up a few things, added ability to handle us data.