more setup
bug fixes