New ending things and bug fix