so that output looks good
correcting mistake
cleaning up
fixed a few things for demo