Improved design

slight tweaks to make and program.c