More rearranged code and even MORE  TODOs for myself and others \o/

Also a *few* nearly invisible improvements here and there