A couple of bug fixes and added the PnAndFSN table
Further enhancements.