more fixes;

finished with all reanimates.