Updated header and some cosmetics