Fix headers, move listeners. 1.1.1