Fixed portfolio issues, still working