A few cleanups and fixes
Added parts to ID