fixed a few account linking bugs
fixed a few account linking bugs
added TODOs and things to test