making things more consistent
oops last commit didnt get everything