made some changes that aren't really worth mentioning