fix two
not done yet...