Fixed more bugs.  Everything seems to be working fairly nicely now