dirty code, fixes #4, more stable, add animations