finish sanitation fixes, done