cosmetics
some fixes
Refactored to use Autofac registration naming and metadata