some changes i had lying around