fixed lotsa bugs!  Matt, the code should be ready for you now