More edits to main.c