processing fix & small cleanup