Fix remaining listeners, simplify init