removed bugs in setup