Added header, and a few more things.