screen.c and minor changes, keeping tutorial in mind