More stuff from jmclaus/videoalpha2_js branch.