Make a config and clean up a lot!

Config + cleaning
Forgot something :P
Clean up again

Some listeners not working