Fixed bugs related to mapped proxies, moved animation monitoring to separate methods to allow for forthcoming animation module to start and stop monitoring.