small updates before merging new animation branch