Added missing scaling, removed unnecessary scaling and minor bug fix