improved
hunting null pointer exceptions
strings polished