Fix bugs, refactor Core, add configurator