added todo
fixed null problems