added tests, properties and fixes
some other fixes