fellows fix and some other stuff