Code cleanup and some TODO items
Fix connect bug
Fix up transfer/modal flow
Hacky update notes for demo