as shown in May 2nd video, plus minor fixes