Update style, add TODOs, minor tweaks