i forget what changes were done:)
fix thro, and more tests