r
more fixes hopefully good