mostly minor stuff