standardizing stuff throughout, a few tweaks here and there also