made some changes... should've committed when I remembered what those changes were ;)