Tidied up the pinfo a bit. Lets see how this shit goes.