Few tweaks to the comment signature, fixed a name issue