Small Tweaks & more TODOs