Many updates and scaling fixes.