Clean up

This removes all warnings, get rid of FXKeychain residue, and fixes a couple naming inconsistencies.