big mix
fixing a looot of things