fixing the same things again

i guess we lost more during the github crash than we thought. redone the
same things ONCE AGAIN