Added animation + lots of updates/fixes