mo' tweaks, less problems