Merge of my animation fixes.

More to come...