A more balanced version + cleaning bugfixes