tweaks to get to a working state