A few bugfixes on Delegates implementation and comments vieweing