minor Updates to main.c

added some more cases and amended To-do's