Fixed object constancy bug and implemented robust scaling