Fix bug with multiple dumpers

+ some stylefixing