Code Cleanup, especially removed old TODOs and comments, rearranged code blocks to be more consistens along all my files and added missing or unclear comments.