added cascade persist, more data, clean up