fix past stupidities. Add new ones