standardized some things, still not done yet