cleanup work for first compile and testing.  Cleanup item registry to
actually work.  Fix basic scanning problems.  Compiles/scans fine now.