and fix the rest of them