Adds comments, reindexes text and some refactoring. Nothing new.