just a couple bugfixes

Ok.. this ought to work