Major changes that includes both bugfixes and also more visible code