Working commit, nothing serious fixed.