opps more fixes