update… multiple changes and bug fixes