Should be done with the madness

things are fixed I think.