Fix a variety of things, test works