Fixes/tweaks to trading + added todo list