main gui commented
data holders commented
Merge remote-tracking branch 'origin/master'