Several small changes, progress in unifying the jungle of scripts I wrote cuz dunno.