Small fixes

removed some TODOs and fixed small things.
Added experimental exchange
Minor fixes - first run