Additional updates to main.c