Added ContextMenu and Documentation Block. Some Refactorings and fixes