more tweaks, trying to bug fix