updated uniquify - should work now - and moved a few things around in regards to defaults. Probably still needs some hefty cleaning up