1st round of tests…passed!

some bugs removed