1.0

fix some rather major bugs uncovered in testing