Disqus fixes and some refactoring