#178 bugfix & setup.js save bugfix