Weight graph and fixes