Facet cleanup; basic metadata cleanup

@lealeelu @bkeese 
This is much better but some things are still funky.  Take a look over and let me know if I overstepped anywhere in my slashing.