Fixes code based on MrPerson's feedback; minor tweaks to formatting and fingerprinting