some more fixes and tweaks to get things working in the new setup