some minor tweaks, going through list