Andy's makes and fixes

@andys_makes_and_fixes@makertube.net