Fixes a couple of things and makes partial progress on other issues