V1.1

Couple of bugfixes, added a bit of config for more understandability.