cleanup
changed version to int in persistance classes

and a few other things