- adding getting of properties correctly and some enhancments