Edited cryptswap1 and portfolio