Fixed animation and unneeded todos