random fixes+ last of the night