Final editing changes and hover-definitions added