Fixed all the thing broken while other's broke it