other tweaks from iodak and laufersteppenwolf