Working on trading + bugs fixes