Cleaned up makefile and updated email in control file
Updated todo items
Modified the todo list