fixed issue with null zero abstractions, removed some unnecessary clone() operations