Small updates to comments, etc in main.c