Portfolio stuff and misc fixes