added todos and some style tweaks