Quality & Consistency Improvements

Quality & Consistency Improvements