Fix ending and stuff