Move around some homework problems, add names to definitions