95% sure everything is fixed!