first round of sfan5's improvements