more fixing
even more fixes