Build dev 41 | More fixes. Pretty awesome.