Minor tweaks, still trying to make reliable