Prepare for animation, props prefix bug fix, cleanup