portfolio and fixes