More use of variables script, rename IDs for consistency,

fix minor animation bug