Dupes: Updated implementation for add that actually stores added paths
Code cleanup to reduce number of warnings