some changes by SimonEbner + video improvements by ct2034