Add some therms and comments