updated entity/scroll for better constraint/scroll updating