Several Clean and Fixes :pill: