fixed small setup-bugs