Final fixes before delivery

Do the final touches on the program to finalize it before delivery