Some refactoring, higher resolution and higher fps.