fixes and start of setup