[#434] Review fixes so far.
[#434] Review fixes so far.

mozilla/butter,BBGInnovate/butter,BBGInnovate/butter,mbuttu/butter,mozilla/butter,mbuttu/butter,robinparadise/videoquizmaker,robinparadise/videoquizmaker,mbuttu/butter