A few changes to make.m for package clarity