further clean up operations, mostly animations left to do