Potential fixes were written poorly and inclomplete. Fix that. Also amend missing infromation based on the development of Fat-Ping since the fixes were written