update
a few fixes