blah
more fixes -mike