Comments added, also there is an issue that has been fixed on another computer, so this merge commit should fix that. Else there will be another merge on GUI.