fixed all broken changes, added some functions to obj