Add some more clarification in some places