minor changes, next saucertriple to fix