Build 125

Just some commenting and some cleaning.