cleaned up the UserAnalysisBase a lot