small tweaks
merged
tweaks
Fixed persistency of list problem, sort of