Misc fixes, pretty much ready to ship

Just gotta work on the custom html5 player and we’re set