Everything is configurable now!

+ some fixes...