More work on pop/unpop animation. Cleaned up a few warnings.