More fixes, still atleast 1 outstanding