Minor improvements; make it actually output something.