safety commit

cleaned up things I momentarily broke