Confirmed all the works, final fixes