ep 79 and a few other fixes