fix to run stock 111 / other minor changes