clean mess, improve cast status tracking