fixed up last things