persistence work
minor changes