added null? at scott's request and fixed string bug