Moved injection of content and reference to controller constructor
added lexer
bugfixed lexer