Fix bunch of things and remove Zizaco