Fixed the last things before end