Bunch of updates with commented code