tweaks to get a working setup