fixes to make it actually work from the last commit