bug fix, more TODO and some content related stuff