Removed leftover traces of old package
Changed filtering such that more designators match; also, minor tweaks