flesh out the rest of the pnset
remove unused file
minor tweaks