Remove ALOT of crap, adding scores + update works