fixing scaling and collision adjustment