updating object structure, adding fixes