fix nothing / null
fixed more bugs