Small fixes
Fixed unused AND buggy scaling