Added several fixes, partial animation, removed notification.