Holmes Inspection

Minor Finds, Major Fixes