Added header and couple of other minor tweaks