Massively simplified and fixed what is left